Merge branch 'wip/baedert/for-master' into 'master'

author Matthias Clasen <mclasen@redhat.com>

Mon, 31 Aug 2020 16:30:21 +0000 (16:30 +0000)

committer Matthias Clasen <mclasen@redhat.com>

Mon, 31 Aug 2020 16:30:21 +0000 (16:30 +0000)
author Matthias Clasen <mclasen@redhat.com>
Mon, 31 Aug 2020 16:30:21 +0000 (16:30 +0000)
committer Matthias Clasen <mclasen@redhat.com>
Mon, 31 Aug 2020 16:30:21 +0000 (16:30 +0000)
diff --cc gdk/wayland/gdkdisplay-wayland.c
Simple merge
diff --cc gtk/gtkpagesetupunixdialog.c
Simple merge
diff --cc gtk/gtkprintunixdialog.c
Simple merge
diff --cc gtk/inspector/prop-editor.c
Simple merge
diff --cc gtk/theme/Adwaita/_common.scss
Simple merge
author	Matthias Clasen <mclasen@redhat.com>
	Mon, 31 Aug 2020 16:30:21 +0000 (16:30 +0000)
committer	Matthias Clasen <mclasen@redhat.com>
	Mon, 31 Aug 2020 16:30:21 +0000 (16:30 +0000)
		1	2
gdk/wayland/gdkdisplay-wayland.c	patch \|	diff1 \|	diff2 \|	blob \| history
gtk/gtkpagesetupunixdialog.c	patch \|	diff1 \|	diff2 \|	blob \| history
gtk/gtkprintunixdialog.c	patch \|	diff1 \|	diff2 \|	blob \| history
gtk/inspector/prop-editor.c	patch \|	diff1 \|	diff2 \|	blob \| history
gtk/theme/Adwaita/_common.scss	patch \|	diff1 \|	diff2 \|	blob \| history